commit 10b7a34451b2849b893cd1002b8477307873ab30
author Junio C Hamano <junio@hera.kernel.org> Thu Jan 01 22:05:17 2009
committer Junio C Hamano <junio@hera.kernel.org> Thu Jan 01 22:05:17 2009
tree d44ce202644b2ba9d76f5457724bf6193dece835
parent bbbb865819d5387ef9ee747115b30b5d2dc7e67b

Autogenerated HTML docs for v1.6.1-35-g3827 

git-mergetool.html

diff --git a/git-mergetool.html b/git-mergetool.html index 7bbcd0b..a94269f 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -320,7 +320,7 @@  </div>   <h2>SYNOPSIS</h2>   <div class="sectionbody">  -<div class="para"><p><em>git mergetool</em> [--tool=&lt;tool&gt;] [&lt;file&gt;]&#8230;</p></div>  +<div class="para"><p><em>git mergetool</em> [--tool=&lt;tool&gt;] [-y|--no-prompt|--prompt] [&lt;file&gt;]&#8230;</p></div>   </div>   <h2 id="_description">DESCRIPTION</h2>   <div class="sectionbody">  @@ -372,6 +372,25 @@  Otherwise, <em>git-mergetool</em> will prompt the user to indicate the   success of the resolution after the custom tool has exited.</p></div>   </dd>  +<dt>  +-y or --no-prompt  +</dt>  +<dd>  +<p>  + Don't prompt before each invocation of the merge resolution  + program.  +</p>  +</dd>  +<dt>  +--prompt  +</dt>  +<dd>  +<p>  + Prompt before each invocation of the merge resolution program.  + This is the default behaviour; the option is provided to  + override any configuration settings.  +</p>  +</dd>   </dl></div>   </div>   <h2 id="_author">Author</h2>  @@ -388,7 +407,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2008-12-10 08:33:20 UTC  +Last updated 2009-01-01 22:04:58 UTC   </div>   </div>   </body>